Skip to content

fix(end-to-encryption): verify metadata#16916

Merged
alperozturk96 merged 13 commits intomasterfrom
fix/e2ee-verify-metadata
May 7, 2026
Merged

fix(end-to-encryption): verify metadata#16916
alperozturk96 merged 13 commits intomasterfrom
fix/e2ee-verify-metadata

Conversation

@alperozturk96
Copy link
Copy Markdown
Collaborator

@alperozturk96 alperozturk96 commented Apr 27, 2026 •
edited
Loading

Uses same verification logic just like iOS, Desktop
Adds tests

@alperozturk96 alperozturk96 mentioned this pull request Apr 27, 2026
Closed
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 27, 2026

APK file: https://github.com/nextcloud/android/actions/runs/24997113741/artifacts/6661594771
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
qrcode (please click on link to get QR code displayed)

@alperozturk96 alperozturk96 requested a review from mgallien April 27, 2026 14:19
alperozturk96
alperozturk96 commented Apr 27, 2026
View reviewed changes
Comment thread app/src/main/cpp/cms_verifier.cpp
jbyteArray messageDataArray,
jobjectArray certPemArray
) {
jsize cmsLen = env->GetArrayLength(cmsDataArray);
Copy link
Copy Markdown
Collaborator Author

@alperozturk96 alperozturk96 Apr 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@marinofaggiana @mgallien

Used for https://github.com/nextcloud/end_to_end_encryption_rfc/blob/e185645eb5fd0849f49e308f006b194772cc3002/RFC.md#verifying-the-metadata

due to BouncyCastle's issue with BER encoded CMSSignedData.

Uses iOS logic.

alperozturk96
alperozturk96 commented Apr 27, 2026
View reviewed changes
Comment thread ndk.env Outdated
@alperozturk96 alperozturk96 force-pushed the fix/e2ee-verify-metadata branch from bef16e3 to 263888e Compare April 29, 2026 07:13
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 29, 2026

APK file: https://github.com/nextcloud/android/actions/runs/25095810422/artifacts/6701744316
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
qrcode (please click on link to get QR code displayed)

@alperozturk96 alperozturk96 force-pushed the fix/e2ee-verify-metadata branch 2 times, most recently from 421ab4d to 77e3efb Compare April 29, 2026 12:46
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 29, 2026

APK file: https://github.com/nextcloud/android/actions/runs/25109632977/artifacts/6707963283
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
qrcode (please click on link to get QR code displayed)

@alperozturk96
Copy link
Copy Markdown
Collaborator Author

alperozturk96 commented Apr 30, 2026

/backport to stable-33.1.x

@alperozturk96 alperozturk96 force-pushed the fix/e2ee-verify-metadata branch from 77e3efb to 9f12a6e Compare April 30, 2026 13:10
@alperozturk96 alperozturk96 force-pushed the fix/e2ee-verify-metadata branch from c103b49 to 8bccac7 Compare April 30, 2026 13:28
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 30, 2026

APK file: https://github.com/nextcloud/android/actions/runs/25168091679/artifacts/6731770815
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
qrcode (please click on link to get QR code displayed)

tobiasKaminsky
tobiasKaminsky previously requested changes May 4, 2026
View reviewed changes
Comment thread gradle/libs.versions.toml Outdated
@alperozturk96 alperozturk96 force-pushed the fix/e2ee-verify-metadata branch from 8bccac7 to f1ba3a4 Compare May 6, 2026 09:10
@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 6, 2026

APK file: https://github.com/nextcloud/android/actions/runs/25426434963/artifacts/6826563017
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
qrcode (please click on link to get QR code displayed)

@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 6, 2026

APK file: https://github.com/nextcloud/android/actions/runs/25430719231/artifacts/6828681970
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
qrcode (please click on link to get QR code displayed)

@alperozturk96
fix(end-to-encryption): verify metadata
5b6c664 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

# Conflicts:
#	app/.gitignore
#	app/build.gradle.kts
#	ndk.env
@alperozturk96
add tests
a8329a8 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
add tests
ad4bec5 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
add tests
c9d97d2 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
add fallback
63a2371 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
openssl-4
bdc41ee 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
open-ssl-3.5.6 lts
73ca397 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
open-ssl-3.5.6 lts
3a61679 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
wip
7cb5902 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
wip
a939b3d 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
wip
e0ded61 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
wip
d6c7e9c 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96 alperozturk96 force-pushed the fix/e2ee-verify-metadata branch from 7b50d5a to d6c7e9c Compare May 7, 2026 06:25
@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 7, 2026

APK file: https://github.com/nextcloud/android/actions/runs/25479668594/artifacts/6848395742
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
qrcode (please click on link to get QR code displayed)

@alperozturk96
wip
bcef379 
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 7, 2026

Codacy

SpotBugs

CategoryBaseNew
Bad practice3535
Correctness6767
Dodgy code216216
Experimental11
Internationalization77
Malicious code vulnerability22
Multithreaded correctness3434
Performance4242
Security1616
Total420420

@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 7, 2026

APK file: https://github.com/nextcloud/android/actions/runs/25479995593/artifacts/6848544066
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
qrcode (please click on link to get QR code displayed)

@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 7, 2026

blue-Light-Screenshot test failed, but no output was generated. Maybe a preliminary stage failed.

@alperozturk96 alperozturk96 merged commit 16fcdbd into master May 7, 2026
13 of 20 checks passed
@alperozturk96 alperozturk96 deleted the fix/e2ee-verify-metadata branch May 7, 2026 06:46
@backportbot backportbot Bot mentioned this pull request May 7, 2026
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tobiasKaminsky tobiasKaminsky tobiasKaminsky approved these changes

@mgallien mgallien Awaiting requested review from mgallien

@marinofaggiana marinofaggiana Awaiting requested review from marinofaggiana

Assignees

No one assigned

Labels

3. to review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@alperozturk96 @tobiasKaminsky